Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Wed, 28 Mar 2007 08:44:08 +0000 (08:44 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Wed, 28 Mar 2007 08:44:08 +0000 (08:44 +0000)

Trivial merge